Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Sat, 29 Oct 2016 21:16:00 +0000 (17:16 -0400)
committerTom Rini <[email protected]>
Sat, 29 Oct 2016 21:16:00 +0000 (17:16 -0400)

Trivial merge